modified content
Merge branch 'master' of https://github.com/NathanExpl0sion/sb
mergins
Conflicts:
	public/assets/bootstrap.min-f1e77fd987a2e800ff166e94a8ead8c9.js.gz
	public/assets/jquery.fancybox-media-c4f19c144590b8447aecd2cb7d844dfd.js.gz
	public/assets/jquery.fancybox.pack-10d9e212d044c764a4ae41178d6c9998.js.gz
	public/assets/jquery.isotope-18bd26237d1314a231a15383739f1ae9.js.gz
	public/assets/modernizr-181c2639a449690823a872f779b3b48c.js.gz
	public/assets/page-0f36418a56408e609fbea9892fac1a67.js.gz
	public/assets/placeholder-1cdd06849fc6e50eec8ddb6f613d971e.js.gz
	public/assets/plugins-920d8cf7425db4547fbba5d29bfa3f37.js.gz
	public/assets/supersized.3.2.7.min-e2accc1be829edbb794aefaf0236b45c.js.gz
	public/assets/waypoints-509db9647dca92ae6122179bac77bbb1.js.gz
	public/assets/waypoints-sticky-0dd5ddb41010cd940b94fe0956b4f4c3.js.gz