Updated stypesheets
Updated some stuff
Merge branch 'master' of github.com:nboneh/final_app