new file:   .meteor/.gitignore
	new file:   .meteor/packages
	new file:   .meteor/release
	new file:   public/icons.png
Merge branch 'master' of https://github.com/charlesjshort/learn

Conflicts:
	LICENSE
	README.md