first functional commit
Merge branch 'master' of http://github.com/curryninja123/CompSci2014
Merge branch 'master' of http://github.com/curryninja123/CompSci2014