added styling changes
fixed conflicts
re-added favicon.ico
fixed pic animation
fixed conflict
removed conflict line, removed unnecessaryjumbtron container
fixed issue with show saved_networks page
Merge branch 'feature/splash_page' into dev
Merge branch 'dev'