Changes
Merge branch 'master' of https://github.com/parpanironak/webproj

Conflicts:
	src/edu/nyu/cs/cs2580/LogSimulation.java
changes