Fixed.
?
Merge branch 'master' of https://github.com/TIY-Q3-ROR-CHS/Team2
Merge pull request #33 from ansleyjones/master

more stylin'
new columns
Merge pull request #34 from jvh1979theironyard/master

do it
devise whitelist
merge fix
Merge pull request #35 from slwaller/master

devise whitelist
user cards
Merge branch 'master' of github.com:TIY-Q3-ROR-CHS/Team2
merge fix
Merge pull request #36 from slwaller/master

merge fix
merge fixed
fixed!