temp at branch
Merge branch 'CodingCrossHome' of http://github.com/mawanyu/vk_power into CodingCrossHome

Conflicts:
	memory.c
Modify software design.docx