added code
Merge branch 'gh-pages' of http://github.com/eipeele/fall2013 into gh-pages