Merge pull request #10 from moog16/master

added profile picture to user
aws environment
r merge
Merge branch 'master' of https://github.com/meamstack/meetme

Conflicts:
	routes/index.js
Modifications for user sessions
Merge branch 'master' of https://github.com/meamstack/meetme
findEvents modified to pull all future events, and Event modified to include user state
Merge pull request #11 from eddyfh/master

Modifications for user sessions
Temporary change: findEvents returns all, not just future events
Merge pull request #12 from eddyfh/master

Temporary change: findEvents returns all, not just future events
Added userId to createEvent
Merge pull request #13 from eddyfh/master

Added userId to createEvent
routes chnage
Merge branch 'master' of https://github.com/meamstack/meetme
comment
Merge pull request #14 from eddyfh/master

comment
Merge branch 'master' of https://github.com/meamstack/meetme
attempted s3 file uploads using aws sdk
merged master with knox