working on adding a twitter timeline to the trucks show page
working on twitter. updating branch after pull on develop
merged conflicts