please work
hope
Merge branch 'master' of github.com:Holderness/Canadian-Tuxedo
Merge branch 'master' of github.com:Holderness/Canadian-Tuxedo
adds attachment capability to users table
Merge branch 'paperclip-trial' of github.com:Holderness/Canadian-Tuxedo

Conflicts:
	Juxtapose/db/schema.rb
adds /public/system to gitignore