Added home.js scaffolding for google calendar event implementation. Changed dummy text.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'

Conflicts:
	home.html
Merge remote-tracking branch 'origin/master'
Added home.js scaffolding for google calendar event implementation. Changed dummy text.
Merge remote-tracking branch 'origin/master'

Conflicts:
	gallery.php
Added gallery.php troubleshooting variables
Added gallery.php troubleshooting variables
Merge remote-tracking branch 'origin/master'