Integration of code from teams 1 and 3
Merge branch 'Sprint-01' of https://github.com/eas604/ISC567Fall2014.git