tweaked location search
Merge branch 'testbranch'
minor style changes
Merge branch 'master' of https://github.com/MrMoogle/deer
Fixed food/location matching, text cutting off issues. It's really all in the regex.
Merge branch 'master' of https://github.com/MrMoogle/deer
Putting in the new and improved regex.
Conflicts:
	app.js
More merge conflict fixing