Built out category tags for photos
deleted tmp files
implemented balanced
fixed merge conflicts
Merge pull request #12 from dcgudeman/master

Implemented balanced
remove temp files
Merge branch 'master' of https://github.com/ikitha/Project_2
started layout work
photo order page looking better
working on photo show page
got users feature specs passing
photo view work
continuing photo view work
got all view roughly working
made changes to fix conflicts
worked on navbar
Merge pull request #13 from dcgudeman/master

Got photo all view roughly working