MainContainer Added
Merge branch 'master' of https://github.com/Nieo/dat215

Conflicts:
	.gitignore
	nbproject/project.properties