Merge pull request #14 from alankalter/Carlos

Carlos
index change
merge
upload photo working
Merge branch 'master' into peterC
Merge pull request #15 from alankalter/peterC

Peter c
voting buttons
merge
GITting the latest and greatest
more commit
commiting merge