Merge pull request #20 from lessin/master

resolving merge conflict
Merge pull request #21 from lessin/master

photos working everywhere
project tags new and edit changes
changes to project tags
read me fix
project tags can be edited now yay
Merge pull request #22 from JoshuaNotowitz/master

read me fix
Merge pull request #23 from lessin/master

email working, photos working, basic voting working
style fixes to project flow
Merge branch 'master' of https://github.com/lasazawa/nameless
merging the email, photos, voting
voting not working
ui fixes for projects
Merge pull request #24 from JoshuaNotowitz/master

voting not working
merging changes with Josh's vote stuff with project ui stuff
fixing nav to be responsive, ui tweaks to project pages.
broken voting
Merge pull request #25 from JoshuaNotowitz/master

broken voting
basic payments working