Merging Demo 1 Code to master

This is what we demoed in class on Thursdito...