first commit
Merge branch 'master' of github.com:ogoldberg/padrino-gallery

Conflicts:
	.gitignore