adds week 2 assignment 2
changes names according to file name regulations. Also, finishing assignment 2 on week 2
adds assignment 2 on week 2, changes file name according to regulations
adds assignment 2 on week 2, changes file name according to regulations
fixes the mess I did, hopefully
Merge branch 'master' into week2_assignment2

Conflicts:
	week3lab/1/1.pde
	week3lab/assignment1/assignment1.pde
	week3lab/week3lab.pde
again, trying to clean up my mess
Merge pull request #3 from goldsmithscomputing2015/week2_assignment2

Week2 assignment2