Cleaning some files.
Merge branch 'master' of github.com:LausDaeus/IS3Team11Project

Conflicts:
	js/charts.js