Merge pull request #2 from michellegoldman/master

Final code changes - ASDI Week1
Final code changes2 - ASDI Week1
Merge branch 'gh-pages'