update
Merge branch 'master' of https://github.com/tonysh518/die_sel

Conflicts:
	css/homepage/screen.css
	index.php
	js/home/functions.js