vinh doan
gitignore my ass
plz commit
this is a message
plz work 2014
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Ball.java
vinh 2014
java doc stuff
Merge branch 'master' of https://github.com/vinhdoan1/Circ.git