try this again
Merge branch 'styling++++++'

Fixing stuff
Adding a bunch of files
Resolving merge conflict and adding styling
Getting up to date. Merge branch 'master' of https://github.com/cjord01/qaware