ghxghykgvhvgvgx
Merge branch 'master' of github.com:eMYKion/GroupProjectMLDM

Conflicts:
	jquerytest.html
Merge branch 'master' of github.com:eMYKion/GroupProjectMLDM
created a css