Updated changes

Moved files around and condensed AI and PS files.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ersb/img/background.jpg