added the popup screen on dashboard html
game javascript
merge conflict
Dashboard changes
commit
Dashboard Commit
Dashboard Commit
Dashboard
Merge branch 'master' of https://github.com/kennysong/SATisfaction

Conflicts:
	client/dashboard.html
popup
popup page update
to pull
junk commit
Merge branch 'master' of https://github.com/kennysong/SATisfaction