my commit
Merge branch 'master' of https://github.com/lonelycube/cs3300-final
Merge branch 'master' of https://github.com/lonelycube/cs3300-final
emoticon style
debugging login redirect issue
Merge remote-tracking branch 'heroku'