added users controller, edit, show and update pages in views, also configured routes
Merge branch 'master' into user-sign-in
creating user edit profile pages and form creation
users show page of the users profile, adding to show them
after sign up path and after sign in path chnaged and fixed tot eh form. Corrected the routes for the users profile edit pages
edit the edith html form to have bootstrap classes
Merge branch 'master' into user-sign-in
adding style to the edit form
application controller and omniautho controller chnaged to accept to redirect the user on sign in to go to specific form, also fixed sing in with google to have a redirect to the correct suer form edit profile only when the user is signed in for the first time
Merge branch 'master' into user-sign-in
fixed conflict in the routes file
routes fix
Merge branch 'master' into user-sign-in
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
added stylign to the edit form for events
edited events form to show the user that created it and also on the sow page
Merge pull request #28 from lukemesiti/forum

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

- merging branch with master