update routes
update routes
Merge remote-tracking branch 'upstream/master'
Add name to README
add contact form
Merge pull request #22 from Bazay/master

Add name to README
Merge pull request #23 from shal23/master

Comments ready for a pull request
Authentication added
add admin page, routes, nav; clean up front page
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:JurgensSmit/codetry into JurgensSmit-master

Conflicts:
	config/routes.rb
	db/schema.rb
fix routes
Merge pull request #25 from Bazay/master

Added Role Permissions
Add OmniAuth Facebook
before acts as taggable
Merge pull request #26 from JurgensSmit/master

Add OmniAuth Facebook
fix user.rb -remove _URL from entries
Merge pull request #27 from JurgensSmit/master

remove _url from column fields
update user profiles
Merge remote-tracking branch 'origin/master'