aaaaaaaa
33
Merge branch 'master' of https://github.com/1-xing/OfficialWebsite

Conflicts:
	App.html
	css/carousel.css
	homepage.html
	img/Homepage1.1.gif
	img/Homepage2.1.png
	img/Homepage2.2.png
	img/Homepage2.3.png