Encryption and File Saving
fixed conflicts

Conflicts:
	Source/Display/Interfaces/MainScreen.cs