Merge branch 'master' of https://github.com/PlainSight/monkeyporridge

Conflicts:
	index.html
Merge branch 'master' of https://github.com/PlainSight/monkeyporridge

Conflicts:
	.htaccess
	assets/js/plugins.js
	assets/js/vendor/modernizr-2.6.2.min.js
	crossdomain.xml