sprunka/demo-framework — pull request #5 by sprunka (2013-06-10 14:19:13+00:00)
Title: Merge all of Jeremy's changes to master.

I think this is how to merge the branch into Master. Wish me luck.