color schemed and refactored
Merge branch 'master' of github.com:manofgate/App3FQ