new natter
Merge branch 'master' of github.com:teddyinfi/teddydemo

Conflicts:
	.gitignore
teddydemo