Installed forem gem for Forum functionality.
--> NEW GEMS: forem, kaminari, canCan
--> NEW MIGRATIONS: (creates forem tables and relationships, and seeds default threads and forums)
--> Modified navigation so forum links and main links act as expected (please see comments in code for details)
--> Routes modified to place forum page at '/forum'
disabled app level authentication to allow engines access to devise rules
Merge branch 'master' into forum
Merge pull request #25 from lukemesiti/lukeDevel

added geocoding
forum fixes
fixed user controller bug, new gem
Added styles to the homepage, also added fonts with @font-face.
Added bootstrap fixed top navigation and fixed bottom navigation.
Merge branch 'master' of https://github.com/lukemesiti/autismconnect into homepage
Merge pull request #26 from lukemesiti/forum

Done, might need to look at the _header partial when lauren merges.
fixed conflict with header partial
google-maps-for-rails
- added gem, google-maps-for-rails
- updated show and index pages to display events on maps
- added underscore.js
- updated events controller to provide coordinates to maps
Merge branch 'master' into lukeDevel

- merged conflicts. no content has been deleted

Conflicts:
	app/assets/javascripts/application.js
generated views for forums to edit CSS, fixed r
Merge pull request #28 from lukemesiti/forum

Awesome, good work. :)
fixed script load order
Merge branch 'master' into lukeDevel

- merging branch with master