added test.level
Merge branch 'master' into b2branch
Merge branch 'master' into b2branch

Conflicts:
	game/res/levels/test.level
added .project to gitignore
Merge branch 'master' into b2branch
Merge branch 'master' into b2branch
Merge branch 'master' into b2branch
Merge branch 'master' into b2branch
levelParser - done: parseLevel() og parseLine()
LevelModel - under construction
LevelToken - klasse som senere må slås sammen med Token
Wall - underklasse av LevelToken
renamed LevelParser
LevelModel - added loadLevel
Levelcontroller - added readLevels, getLevels
LevelController - v1 done
LevelModel - v1 done
test.level under construction
Merge branch 'master' into b2branch

Conflicts:
	game/src/no/ntnu/folk/game/gameplay/levels/controllers/LevelController.java
	game/src/no/ntnu/folk/game/gameplay/levels/levelParser.java
	game/src/no/ntnu/folk/game/gameplay/models/LevelModel.java