Button progress
Started ui buttons.

Merge branch 'master' of https://github.com/clairchiara/KittenBox

Conflicts:
	KittenBox/ui.cpp