8985t97
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
	views/index.html
Merge branch 'master' of https://github.com/ArthurStam/kupaka

Conflicts:
	index.php
	views/index.html