Modify workespace
Add Def for TRISIO
Merge branch 'Last'

Conflicts:
	main.c
Merge branch 'master' of https://github.com/alexjan/blk

Conflicts:
	main.c