Working on improved error notifications
Merge branch 'staging' into ryan/controller
Started to do error catching
Merge branch 'staging' into ryan/controller

Conflicts:
	src/app/controllers/ActionController.java
	src/app/controllers/CommandController.java
Tried catching error when save file is corrupted
Still trying to do error handling