Main driver update complete
Main function for driver complete
Merge branch 'master' of
https://github.com/cs2103aug2014-w13-2j/main.git

Conflicts:
	src/main/Dynamiz.java
Update main()
Merge branch 'master' of https://github.com/cs2103aug2014-w13-2j/main.git