delted shit
Merge branch 'master' of https://github.com/blitzkriegg/AllianceResourceSummary

Conflicts:
	AllianceResourceSummary/src/java/com/myapp/jdbc/SelectRecords.java