First commit
Merge branch 'master' of https://github.com/infomiho/Rails-Photos

Conflicts:
	.gitignore