Merge branch 'master' of https://github.com/Royalmack/SEP-Assignment

Conflicts:
	Artnoc/SEP.sdf
	Artnoc/SEP.v11.suo