continuing the gameplay path. We have implemented a bunch of stuff in the tweets controller. users can input twitternames. the next step is to see if our validation of the twitter call works
Merge branch 'master' into gameplay
Fixing conflicts.
Merge branch 'gameplay'
fixing conflicts
adjusted twitter api to take one argument
fixed merge conflicts