make this stuff heroku ready
make this stuff heroku ready
Merge branch 'master' of heroku.com:glacial-tundra-8405

Conflicts:
	config.ru
add categories