Added gitignore and removed DS_Store
Finished block functions
Merge branch 'master' of github.com:thecalvinchan/cs111_lab3