Initial Commit
added hidden files
Merge branch 'build1' of github.com:wholmes/learn

Conflicts:
	.gitignore
added third line to foo.txt