^^
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/2014.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	images/2014.html