Initial commit
Merge branch 'master' of https://github.com/benevolentprof/inf1340_2014_asst1