3 commits

Author	SHA1	Message	Date
Luke Pulverenti	33b01d778c	merge from dev	2015-12-14 10:43:03 -05:00
Luke Pulverenti	504384e83d	update sync process	2015-09-24 13:08:10 -04:00
Luke Pulverenti	cc428aac1d	update search	2015-09-23 22:31:40 -04:00