Initial commit from local git
Merge branch 'master' of github.com:clairchiara/KittenBox

Initial merge to sync local with remote git
Merge branch 'master' of github.com:clairchiara/KittenBox
Added Game class
Started ui
Merge branch 'master' of https://github.com/clairchiara/KittenBox
integrated interface
Added new main
Working on game dynamics
Working on game dynamics
More game dynamics
Finished initial game mechanics
Small update
Dunno what this is but I'm syncing it anyways
Button progress
Started ui buttons.

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

Conflicts:
	KittenBox/ui.cpp
deleted files
.gitignore
Shared XCode data
Better random number generator and cleaned a bit