changed stufff
gitignore
merge conflict in gitignore fixed
resolve merge conflicts locally
Merge branch 'master' of https://github.com/Elffers/Hippo
solved merge conflicts
added product list and links in order
Product show page functional
db development sqlite 3 gitignore??
change column name from state to status
Fixed merge conflict in css