Darude Sandstorm
Merge branch 'master' of https://github.com/KAndrews101/Kamori

Conflicts:
	data/img/home/option.png
walla