Summary
Merge branch 'master' of https://github.com/tiredbug/Kutu-Kutu

Conflicts:
	assets/css/bootstrap.css