updating the git ignore
setting up C9 development env
Merge branch 'master' of ryex.github.com:Ryex/Mewars

Conflicts:
	socket/chat_socket.js

merging changes to once again work on cloud9