more
Merge branch 'master' of github.com:elmariachi111/photoration

Conflicts:
	public/stylesheets/style.css