Initial commit
add ignore
test
Merge remote-tracking branch 'Udacity/master'

Conflicts:
	.gitignore