pre-merge
Merge branch 'master' into parallax-page
darker imgs, mobile friendly, parallax ready to be built
Merge pull request #3 from foundersandcoders/parallax-page

Parallax page
few bits and bobs
Re-added that fucking js that I wrote yesterdat, piece of shit git
Merge pull request #4 from foundersandcoders/parallax-page

Re-added that fucking js that I wrote yesterdat, piece of shit git
updated out of date jquery api reference
divs resize on load now at any window size
parallax functional via media query - all mobile styling pretty much complete
added some comments before finishing styling
restyled on large screen
Merge pull request #5 from foundersandcoders/parallax-page

Parallax page
Grid system
Merge branch 'master' of https://github.com/foundersandcoders/newlookfac

# By harrygfox
# Via harrygfox
* 'master' of https://github.com/foundersandcoders/newlookfac:
  restyled on large screen
  added some comments before finishing styling
  parallax functional via media query - all mobile styling pretty much complete
  divs resize on load now at any window size
  updated out of date jquery api reference
  Re-added that fucking js that I wrote yesterdat, piece of shit git

Conflicts:
	fac/js/founders.js
navfex
small nav change
Contact page skeleton
Nav and footer
change vid