12/9/14 | Update 1
Merge branch 'master' of https://github.com/EliteCreations/The-Altering

Conflicts:
	App.config
	Launcher/Main/Coding/App.config
	Launcher/Main/Coding/Windows/App.config
12/9/14 | Update 2