merge
Merge branch 'master' of https://github.com/haiqvo/HomePage
merge
Merge branch 'master' of https://github.com/haiqvo/HomePage

Conflicts:
	public/rasterize.js
merge
Merge branch 'master' of https://github.com/haiqvo/HomePage
Merge branch 'master' of https://github.com/haiqvo/HomePage
merge
Merge branch 'master' of https://github.com/haiqvo/HomePage