before merge
Merge branch 'development' of github.com:climbingcode/bam- into development
business card displaying
merging comflicts
commit for merge
all
files
business card generation
Merge branch 'pdf_builder' into development
all
merge coflicts
Completed method in color controller to remove # from a hex string.
Completed server side hex to rgb conversion.