update Mon 6.14PM 18 NOV 2013
Merge branch 'master' of https://github.com/eidolonz/CSC319_Project_RandomArt

Conflicts:
	randomArt/ArtFrame.java
	randomArt/ArtPanel.java
	randomArt/Expression.java
	randomArt/package.bluej