update
add javascript to poem wall
Merge branch 'master' of github.com:teebii/codetry into teebii-master

Conflicts:
	app/views/comments/_comment.html.erb
	app/views/comments/create.js.erb
	app/views/poems/show.html.erb
	app/views/poems_wall/index.html.erb
	db/schema.rb
Merge remote-tracking branch 'origin/master'