Awesome commit
Merge pull request #12 from kweek/master

Krissy's User Model Changes
please work
fixed?
Kory's Commit
trying so hard
updated gitignore
Merge dangit
pushing to pull
conflict merge
adding the files again
Merge pull request #13 from jpsiepert/master

Changes
what?
Merge branch 'master' of https://github.com/KorySumsion/forever-planned
Merge pull request #14 from MarkTonkinson/master

Load of Changes for passport, bcrypt etc,
added a comma
Merge pull request #15 from jpsiepert/master

added a comma
fix this already