Copied all of the code from my Documents to sourceTree
Merge branch 'master' of https://github.com/ycuevas/lab3

Conflicts:
	src/BouncingSmileyApplet.java