fleshed out program
Merge branch 'master' of https://github.com/downtownHippie/HCCS-ITSE2453-sum2014.git