Pc update
wat
Merge branch 'master' of https://github.com/doodger/sfrondy

Conflicts:
	public/css/bootstrap-responsive.min.css
	public/css/components/plans.css
	public/css/focus-1.1-responsive.css
	public/css/focus-1.1.css
	public/css/pages/about.css
	public/css/pages/contact.css
	public/css/pages/homepage.css
	public/css/pages/services.css
	public/font/FontAwesome.otf
	public/font/fontawesome-webfont.eot
	public/font/fontawesome-webfont.svg
	public/font/fontawesome-webfont.svgz
	public/font/fontawesome-webfont.ttf
	public/font/fontawesome-webfont.woff
	public/img/bg.png
	public/img/footer-logo.htm
	public/img/footer-logo.jpg
	public/img/footer-logo.png
	public/img/gallery/1_large.jpg
	public/img/gallery/1_small.jpg
	public/img/gallery/2_large.jpg
	public/img/gallery/2_small.jpg
	public/img/gallery/3_large.jpg
	public/img/gallery/3_small.jpg
	public/img/glyphicons-halflings-white.png
	public/img/glyphicons-halflings.png
	public/img/masthead/masthead-2.jpg
	public/img/masthead/masthead-3.jpg
	public/img/masthead/masthead-4.jpg
	public/img/masthead/masthead.jpg
	public/img/profiles/profile-1.png
	public/img/profiles/profile-2.png
	public/img/profiles/profile-3.png
	public/img/responsive-nav-bg.png
	public/img/social/social-sprite.png
	public/img/title.png
	public/js/focus.js
	public/js/jquery-1.7.2.min.js
	public/js/jquery-1.9.1.min.js
	public/js/plugins/faq/faq.css
	public/js/plugins/faq/faq.js