commit of Flaskr assignment
Merge branch 'gh-pages' of http://github.com/Pcolar/fall2013 into gh-pages
Merge