before bryan's pull
commiting all changes from Austin
starts tracking some images
Merge remote-tracking branch 'origin/master' into resize_edits

Conflicts:
	css/styles.css