Merge remote-tracking branch 'origin/test'

Conflicts:
	app/app.rb
	app/pics.db
Merge branch 'master' of https://github.com/jmontanoa/pictures

Conflicts:
	app/app.rb
	app/pics.db