Revert 13791a8..2e27477

This rolls back to commit 13791a8a461bab9ce38c2598de1e4c8333fd49ac.
this is now my version
Merge branch 'master' of https://github.com/NathanBland/softEng2013

Conflicts:
	.idea/workspace.xml
	app/foundation/foundation.abide.js
	app/foundation/foundation.alerts.js
	app/foundation/foundation.clearing.js
	app/foundation/foundation.cookie.js
	app/foundation/foundation.dropdown.js
	app/foundation/foundation.forms.js
	app/foundation/foundation.interchange.js
	app/foundation/foundation.joyride.js
	app/foundation/foundation.js
	app/foundation/foundation.magellan.js
	app/foundation/foundation.orbit.js
	app/foundation/foundation.placeholder.js
	app/foundation/foundation.reveal.js
	app/foundation/foundation.section.js
	app/foundation/foundation.tooltips.js
	app/foundation/foundation.topbar.js
	app/protected/js/foundation.min.js
	app/protected/js/vendor/custom.modernizr.js
	app/protected/js/vendor/jquery.js
	app/protected/js/vendor/zepto.js
	readingApp/.idea/workspace.xml
	readingApp/index2.html