making stuff work
Merge branch 'master' of https://github.com/polenzdakota/SJSU-CS160-160ZAIBATSU

Conflicts:
	website/src/java/Models/Queries.java
changed img location size
Merge branch 'master' of https://github.com/polenzdakota/SJSU-CS160-160ZAIBATSU
added card images
Merge branch 'master' of https://github.com/polenzdakota/SJSU-CS160-160ZAIBATSU