Phase 4 template
Merge branch 'master' of git://github.com/gabrielle98/ticket

Conflicts:
	README.md
part 5 skelton
forgot to push this