Merge pull request #17 from pocket-gophers-2014/code_fusion_mvp

Code fusion mvp
Merge branch 'master' into app_rebuild