add google map display with yelp -> use yelp1.php'
;
add form
update FQL to check friends events and highligh days with events
Merge branch 'master' of heroku.com:safe-atoll-8318
Merge branch 'master' of github.com:tdegenko/CSC210FinalProject

Conflicts:
	calendar.php
	preferences.php
	submit.php
merged shit