LindsayYoung/fara — pull request #6 by LindsayYoung (2013-11-13 19:27:13+00:00)
Title: Design merge

Merging the design_merge into master