meh
Merge branch 'master' of https://github.com/Holderness/Canadian-Tuxedo

Conflicts:
	Juxtapose/app/models/user.rb
	Juxtapose/config/environments/development.rb
Gemfile
development
Merge branch 'master' of https://github.com/Holderness/Canadian-Tuxedo
adds clothing item images