deathcam start
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
deathcam ui introduction
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
wip
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
pull from upstream
testing ui entry for deathcam
moved prompt to cleanup_at_end
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
[WIP] Deathcam prompt in, just need to wrinkle out some bugs
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam

Conflicts:
	src/game.cpp