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
worked on navbar
made changes to fix conflicts