irham : update kasir dan tema kasir
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/kasir/index.html
	app/views/kasir/menu.html
Merge branch 'master' of https://github.com/brianmr31/restoran