heroku commit
added highlighting
doesn't work yet
sorting
Merge branch 'master' of github.com:ryphon/RottenPotatoes

Conflicts:
	.gitignore