working on styling
looking good
gitignore update
Merge branch 'dev_josh'
merge