massive commit day0 week2
Merge branch 'master' of github.com:modzozo/hack101