confilct found?
Merge branch 'master' of github.com:apmcdermott/wdi_project_2

Conflicts:
	amanda.txt