wallacefeature
Wallace changes
Merge branch 'master' of https://github.com/sparksmb/learn-git into wallacefeature

Conflicts:
	index.html
Merge pull request #3 from sparksmb/wallacefeature

wallacefeature