style
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/style/toystyle.css
Merge branch 'master' of https://github.com/TrueImagine/blackjax

Conflicts:
	public/login_admin_proses.php