Moved first_words method to story
Merge branch 'User' of https://github.com/ncss-2014-group-3/word-by-word into User
Fixed template nonexisting function
Merge remote-tracking branch 'origin/master' into User
Fixed cursor.commit() to connection.commit()

For the FINAL time
Merge remote-tracking branch 'origin/master' into User
fixed double page render when not logged in
fixed bad merge
Merge remote-tracking branch 'origin/master' into User
Updated database and createDatabase.sql
Updated stories.html

Made welcome message a heading, added padding between description and
story list table
Removed create story link if user isn't logged in

yea, pretty much...
fixed user object passing instead of string
Fixed adding 4 values instead of 3 into users table
Merge remote-tracking branch 'origin/master' into User

Conflicts:
	templates/header.html
	wordbyword.py
Actually fixed below
Merge branch 'User' of https://github.com/ncss-2014-group-3/word-by-word into User
Merge remote-tracking branch 'origin/master' into design