refactor TweetTest
add a test for passing in a string to Tweet.hashtags
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
half tests
Merge branch 'master' into mine
Changed the name of a test to be proper
Adding BlackList class so multiple teams have an interface for development.
Adding BlackList class so multiple teams have an interface for development.
Merge pull request #2 from DonAbney/test-for-string

Merging changes to refactor TweetTest.
Merge branch 'master' of https://github.com/DonAbney/pcaWinter2014
Merge branch 'master' of https://github.com/DonAbney/pcaWinter2014
implemented getDisplayTweets to show all tweets that will be on the display
updated the functionality to match what is in the requirements
implemented getDisplayTweets to show all tweets that will be on the display
Merge branch 'master' into hashtag

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

Conflicts:
	src/main/groovy/com/pca/TwitterClient.groovy
	src/test/groovy/com/pca/TwitterClientTest.groovy