Changed devise setup so registration also takes username. Logging in can be done with username or email. Changed views to display username instead of email.
Fixed online users to online show users that are not yourself
Merge branch 'master' into jeremy2
Merged with master made slight change in welcome controller
Merge pull request #17 from otherwhitefrank/jeremy2

Jeremy2
Updating to HEAD