Wish list and requests
Merge branch 'master' of https://github.com/pinya/ttt

Conflicts:
	app/views/stuffs/index.html.slim