finish first part
Merge branch 'gh-pages' of github.com:thebigspoon/fallfling2013 into gh-pages