Version 2.2

Implemented Functional and Unit Testing!
Merge branch 'master' of https://github.com/cyimking/CSE-360-Project-2014