File cleanup
File maintenance
Merge branch 'master' of github.com:tiy-durham-june2014-frontend/team-blue

Conflicts:
	.DS_Store