Moved Michael's addition of himself down a row so it does not conflict with Tom
Merge branch 'MichaelWaltuch-patch-1'

Adds Michael to the team
Merge branch 'master' of https://github.com/CodeForCharlotte/codeforcharlotte.org
Adds Michael to the team roster

Conflicts:
	data/team.yml