added default sprite font
fixed some minor bugs
began implementing generic data structure
Merge branch 'master' of https://github.com/TDT4240-Exercises/TDT4240-Project

Conflicts:
	x2-gameproject/x2-gameproject/x2-gameproject/ResourceManager.cs
small merge fix