first commit
Merge branch 'master' of https://github.com/jbukow01/sp2-cw2-2014