Test
test2

Conflicts:
	404/index.html
	Rakefile
	team-alpha-app/index.html
	whats-awesome-this-week/index.html