made tests pass from last merges
added default picture
about to add usernames to users
Added user profile page and temp style changes
Merge pull request #8 from fredmcgroarty/user_profiles_branch

Added user profile page and temp style changes
about to merge with aster, added usernames and generate user profile upon devise account create
merged with marks stuff
merged master