trolololol

Signed-off-by: Markus Tillman <reetopps6@hotmail.com>
Merge branch 'master' of https://github.com/Malow/NotDeadYet
Merge branch 'master' of https://github.com/Malow/NotDeadYet
Merge branch 'master' of https://github.com/Malow/NotDeadYet
Removed inprogress folder /anbd contents)

Signed-off-by: Markus Tillman <reetopps6@hotmail.com>
Merge branch 'master' of https://github.com/Malow/NotDeadYet

Conflicts:
	WorkingDir/Media/Icons/inprogress/FirstAid_Bad_Icon.png
	WorkingDir/Media/Icons/inprogress/FirstAid_Good_Icon.png
	WorkingDir/Media/Icons/inprogress/temp_template.psd

Signed-off-by: Markus Tillman <reetopps6@hotmail.com>