File cleanup

Some files that need to be commited
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/img/concerts/dec_placeholder.jpg