added username column to Users table
Merge branch 'master' of github.com:EthanGould/Texchange

Conflicts:
	db/schema.rb
built form for new card + card show page