init
Merge branch 'master' of https://github.com/bakkerjarr/nwen304-2014-lab2