gitignore, gitattributes, line ending normalization
development_server (static web server)
Removed node_modules (shouldn't be committed)
temporary for diff
changing line endings
merged diff
Resolving diff
Should work
Merge branch 'pr/1'

Conflicts:
	client/sourcemap
	client/src/classes/Character.js
	client/src/classes/EntryBox.js
	client/src/classes/map.js
	client/src/utils/Utils.js
Fixed the gitignore
Merge pull request #5 from PandaCoder/master

node_modules cleanup, added development_server.js