Merge branch 'master' into makefile_overhaul

author Fred Sundvik <fsundvik@gmail.com>

Tue, 23 Aug 2016 06:38:05 +0000 (09:38 +0300)

committer Fred Sundvik <fsundvik@gmail.com>

Tue, 23 Aug 2016 06:38:05 +0000 (09:38 +0300)
author Fred Sundvik <fsundvik@gmail.com>
Tue, 23 Aug 2016 06:38:05 +0000 (09:38 +0300)
committer Fred Sundvik <fsundvik@gmail.com>
Tue, 23 Aug 2016 06:38:05 +0000 (09:38 +0300)
diff --cc readme.md
Simple merge
diff --cc tmk_core/common.mk
Simple merge
author	Fred Sundvik <fsundvik@gmail.com>
	Tue, 23 Aug 2016 06:38:05 +0000 (09:38 +0300)
committer	Fred Sundvik <fsundvik@gmail.com>
	Tue, 23 Aug 2016 06:38:05 +0000 (09:38 +0300)
		1	2
readme.md	patch \|	diff1 \|	diff2 \|	blob \| history
tmk_core/common.mk	patch \|	diff1 \|	diff2 \|	blob \| history