routing incomplete
Revert "routing incomplete"

This reverts commit 94984fe44259c1f1cb36933072e7b1795d8f9301.
update
Merge branch 'master' of https://github.com/nyul/nRF_TP

Conflicts:
	.gitignore