got twitter client working
wip twitter setup
whatever changes to application.yml
testing gitignore
wip first model view
merge conflict fix
resolved conflict
more conflict resolution
resolved conlfict"