merge fix
Merge branch 'development' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into development
Merge branch 'merging_css_files' of https://github.com/sweetlevy/Project_2_Grumpy_Cat into merging_css_files
updated the css of the app
updated css/javascript