test
Merge branch 'dev'

Conflicts:
	Makefile
Merge branch 'dev'
Merge branch 'dev'
Added spinlock implementation
Merge branch 'master' into dev