update routes
update routes
Merge remote-tracking branch 'upstream/master'
comments
comments
updated name in readme
Merge pull request #21 from sherwyngoh/master

Facebook Plugins Added and Privacy Policy Filled
modified models for user and poem to add acts_as_votable"
Add name to README
fixed-routes.rb
Merge remote-tracking branch 'upstream/master'
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
ban confirm button added
authorization for ban button added
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