Lab 2 draft complete.
Merge branch 'master' of https://github.com/karenyyng/Fall14_Phy102

I have made changes on my end and cannot commit without a merge