Add slack integration to .travis.yml
Merge pull request #40 from aaronmallen/feature/add_slack_to_travis

Add slack integration to .travis.yml
added assembly badge to readme.md
Merge pull request #41 from aaronmallen/feature/add_assembly_badge_to_readme

added assembly badge to readme.md
created dummy data for development environment.

resolve bounty #115
Merge pull request #42 from aaronmallen/feature/asm-115

asm-115
added jetbrains gitignore
Merge pull request #43 from aaronmallen/feature/rubymine

added jetbrains gitignore
* installed will_paginate gem
* added pagination to clients index

resolve bounty #114
Merge pull request #44 from aaronmallen/feature/asm-114

asm-114
* fixed issue that caused error on nil client_phone
* added phone validation to user_profile for client_contacts

resolve bounty #117
Merge pull request #45 from aaronmallen/bug/asm-117

asm-117
contacts are now viewed and edited in the client context

resolve bounty #112
Merge pull request #46 from aaronmallen/bug/asm-112

asm-112
* added special_key to users
* send special_key instead of api_key as verify id
* added check for 24 hours logic
* added the ability to retry verification

resolve bounty #113
Merge pull request #47 from aaronmallen/bug/asm-113

asm-113
Fix Merge Conflicts