Doing the thing with the things

Added cancel to make story.
Merge remote-tracking branch 'origin/master' into design
Merge branch 'master' of https://github.com/ncss-2014-group-3/word-by-word
minor typos etc
merged login.css into style.css and fixed header
Removed score from createDatabase.sql
Merge remote-tracking branch 'origin/master' into user-profile

Conflicts:
	static/css/style.css