initial
Merge https://github.com/fboehm/fall2013

We just set up the github repo and needed to merge it with the local version so that the local files can be pushed to github