dfge
Merge branch 'dev' of https://github.com/dinushab/pilot into dev

Conflicts:
	test.txt.txt