progress as of 2-7-14
progress as of 2-7-14 with some fixes
Merge pull request #7 from BuracayBeach/team3_v1.1

Team3 v1.1