first commit
Merge branch 'master' of https://github.com/ecagiral/shirtbyshirt.git

Conflicts:
	app/views/Application/index.html