added more tabs lol to see at a glance and breakdown
Merge branch 'master' of https://github.com/cs147win2014/project