Initial commit
Merge branch 'master' of github.com:ghuitster/CS-345-Winter-2013 into project_6