Finished the filter by hashtag card and did some refactoring
Merged master and fixed conflicts
Not sure what these changes are, but here we go
Changed the name of a test to be proper
updated the functionality to match what is in the requirements
Merge branch 'master' into hashtag

Conflicts:
	src/test/groovy/com/pca/TweetTest.groovy
Merge branch 'master' of https://github.com/DonAbney/pcaWinter2014

Conflicts:
	src/main/groovy/com/pca/TwitterClient.groovy
	src/test/groovy/com/pca/TwitterClientTest.groovy
Merge branch 'master' of https://github.com/DonAbney/pcaWinter2014