Merge pull request #1 from JacksonTeh/master

Add sillyFunction()
Add aaa()
Merge in Jackson's silly function
Resolve merge conflict in Shengli's spiMaster.h