Merge branch 'develop'
Added styles
Merge branch 'master' into develop
added cat photo
Merge branch 'develop' of github.com:RyanNielson/hashpipe into develop