added devise, fname, lname, username
Merge branch 'master' of https://github.com/nyhunter77/emotions

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/nyhunter77/emotions