commit file for merge
Merge branch 'master' of https://github.com/ajohnson-echo360/mtgsite.git

Conflicts:
	website/src/main/webapp/WEB-INF/jsp/location/location-view.jsp