clean up merge conflict
Merge branch 'master' of github.com:rhewitt22/AmyWeb