Bolded titles
Merge branch 'design' of https://github.com/ncss-2014-group-3/word-by-word into design
Loginned to the regster linkin'

There is now a link from the login page to the register page, as well as
a login button on the header.
Todo: link to user page if already logged in.
Making upvote buttons better
Merge remote-tracking branch 'origin/master' into design

Conflicts:
	templates/login.html
Moved first_words method to story
Put the sign in thing back in
Put the extra thing back out
Merge branch 'User' of https://github.com/ncss-2014-group-3/word-by-word into User
Merge remote-tracking branch 'origin/master' into design
Fixed template nonexisting function
Merge remote-tracking branch 'origin/master' into User
added user stats
Fixed cursor.commit() to connection.commit()

For the FINAL time
Merge remote-tracking branch 'origin/master' into User
Merge remote-tracking branch 'origin/master' into user-profile
fixed double page render when not logged in
Added method get_score
fixed bad merge
Did some user stuff

When the user is logged on, different things are shown. Some errors