Merge pull request #17 from mplaza/melabranch

Melabranch
Merge pull request #19 from mplaza/melabranch

fixing ends
Merge pull request #20 from mplaza/melabranch

incorporated some of lex styling
Merge pull request #21 from mplaza/melabranch

starting serialization and angularification
Merge pull request #22 from mplaza/melabranch

partner details with toggle
Merge pull request #23 from mplaza/melabranch

Melabranch
pushing to heroku
added image attachment - paperclip
S3 paperclip troubleshooting
pictures pulled from s3 now display
partners paperclip working
Merge pull request #24 from mplaza/melabranch

Melabranch
prepare for merge
trying to remerge
reremergey
Merge branch 'master' into mailer
super remergemerge
images display on index