style
Merge branch 'master' of https://github.com/codexa/pictroid

Conflicts:
	views/index.jade