scoreboard start, loads to add
Merge remote-tracking branch 'origin/master' into Scoreboar
Implemented storing of emails

Updated createDatabase.sql to include an email field in table users.
Also you can optionally pass in an email in the create function of
user.py and use the new method get_email to return a string of the
user's email.
Changed score and emails to @property
Implemented user ordering for scoreboard

Thanks Tian!!!
Merge remote-tracking branch 'origin/master' into scoreboard
Merge remote-tracking branch 'origin/user-profile' into gravatar

Conflicts:
	database/createDatabase.sql
added email to register
Merge remote-tracking branch 'origin/Design-sidebar-move'
fixed username passing
Fixed article position
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word
fixed welcome msg
Fixed not passing user to homepage
Merge branch 'gravatar' of https://github.com/ncss-2014-group-3/word-by-word into gravatar
Merge remote-tracking branch 'origin/master' into gravatar
Reverting (to a newer version...) of word by word
Minor design changes
Fixed blurb for story

Gets first ten most popular words, traversing highest voted branch only.
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word