sign up with story
Merge branch 'master' of https://github.com/sierrakn/247finalproject

Conflicts:
	views/profile.ejs