Adding gitignore
Adding progress from the 10.02 session
Completing merge