add mike
added timmy
Merge branch 'master' of github.com:newdynamx/devOps into franco

Conflicts:
	name.txt
raisin timmy