Gallery added, bug appear @aahung
Merge branch 'master' of https://github.com/xiaottang2/Physics_Screen

Conflicts:
	js/main.js