can add comments, might want to incorporate ajax later
merged like a damn foo
Merge branch 'master' of https://github.com/thinkpad20/synesthesia

Conflicts:
	app/views/users/show.html.erb