added basic plugins
NesC, command-t
Merge remote branch 'origin/master'

Conflicts:
	.gitmodules