wertyui
Merge branch 'master' of github.com:sasharoover/navigation-service

Conflicts:
	README.md
added some hey hey hey
Merge branch 'master' of github.com:sasharoover/navigation-service