img changes
Merge branch 'master' of https://github.com/jchong16f/assoc-mobile

Conflicts:
	js/app.js