Merge pull request #55 from evelynStraigt/develop

Develop
Merge pull request #56 from evelynStraigt/feature/readme

Updated README with Developer Information.
add waffle.io badge
Merge pull request #61 from waffle-iron/master

waffle.io Badge
Resolved merge conflicts.