FAQ Update
Update 2014-10-08-faq.md
Update 2014-10-08-faq.md
FAQ Additions
Merge branch 'FAQ-update' of https://github.com/timschraeder/the-grid into timschraeder-FAQ-update

Conflicts:
	_posts/2014-10-08-faq.md
Merge branch 'timschraeder-FAQ-update'