initial test commit
added some code for stats screen (not complete!)
merged testing and master branches