remove bad line
Merge branch 'master' of github.com:brainflake/mannequin

Conflicts:
	views/layouts/main.handlebars
remove test images