Placeholder Tiles and map
Levels.js to load tiled maps
Merge branch 'master' of github.com:Rialgar/GGJ2014
removed local installation of socket.io
Level parsing succesfull, next step: drawing!
Merge branch 'master' of github.com:Rialgar/GGJ2014
Let there be drawing!
Merge branch 'master' of github.com:Rialgar/GGJ2014

Conflicts:
	js/main.js