added fixedish words
Magic.
Bolded titles
Merge branch 'design' of https://github.com/ncss-2014-group-3/word-by-word into design
fix completely broken css
Fix "fixed" fixed words (fixed now).
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
Put the sign in thing back in
Put the extra thing back out
Merge remote-tracking branch 'origin/master' into design
Fixed the fixed words which weren't fixed, but now they are fixed.
Merged in origin/master
Be more specific.
Added method get_score
Did some user stuff

When the user is logged on, different things are shown. Some errors
Made the users name show in the profile thing

Did stuff.
Removed unnecessary code from get_score
Merge remote-tracking branch 'origin/master' into design

Conflicts:
	templates/word.html