Added image slider and twitter feed
Changed some colours
Twitter feed size
Merge pull request #1 from Zordox/master

Mac-Robotics-Website
Size issues
Merge pull request #2 from Zordox/master

Update
Moved twitter feed to right side
Merge pull request #3 from Zordox/master

Moved twitter feed to right side
Moved stuff around
Merge pull request #4 from Zordox/master

Moved stuff around
Positions
Merge pull request #5 from Zordox/master

Positions
Fixed media and sponsors
Merge pull request #6 from Zordox/master

Fixed media and sponsors
Small changes to css
size changes
Merge branch 'master' of github.com:ericye16/Mac-Robotics-Website

Conflicts:
	jumbotron-narrow.css