footer fix and started hackathon skip the setting page
Merge remote-tracking branch 'upstream/master' into dev

Conflicts:
	osslab/src/app/views.py
lab-122 is ok
resolve the comments
resolve the comments
Merge pull request #50 from czx0619/dev

looks good now