Made a backup folder
Merge branch 'master' of https://github.com/royb3/Energy_Vampires

Conflicts:
	RealTime_V2_Backup/Messages.vsd
	RealTime_V2_Backup/Player.js
	RealTime_V2_Backup/Team.js
	RealTime_V2_Backup/announces.json
	RealTime_V2_Backup/authorization.json
	RealTime_V2_Backup/countdown.json
	RealTime_V2_Backup/gamestate.js
	RealTime_V2_Backup/gamestate.json
	RealTime_V2_Backup/index.html
	RealTime_V2_Backup/jquery-1.8.2.min.js
	RealTime_V2_Backup/letPlayerJoinTest.html
	RealTime_V2_Backup/location.json
	RealTime_V2_Backup/message.json
	RealTime_V2_Backup/server.js
	RealTime_V2_Backup/socket.io.js