added c/conditionals, c/maps
Merge pull request #31 from woodruffw/c

added c/conditionals, c/maps