Fixed merge issues.
Added join game functionality, puts to db, adds to user upcomingGames.
Finished join game, needs db function to update user to work.
4/10list a game page working able to input game data into DB
Merge branch 'join-a-game-feature'
Mostly functional, needs prepopulated fields.
Fixed defaults.
Fixes.
Fixed.
Fixed.
Fixed user id.
Fixed some layout items.
Merge branch 'fix-listagame'
Added find user and game methods.
Merge branch 'join-a-game-feature'
Added get game by id functionality.
pacifying git.
Merge branch 'seegame-feature'

Conflicts:
	public/js/.DS_Store
brining in public files
slight chagnes to index file script tag paths