temp
Merge branch 'master' of https://github.com/BenMQ/laughing-avenger
Merge remote-tracking branch 'ec2/master'

Conflicts:
	public/js/main.js