some changes
Merge remote-tracking branch 'origin/master' into ollie
changes
more changes
commit before Nicerhugs merge
post nh merge
added script tag, testing twitter intergration
fixed merge conflicts
Merge pull request #19 from NicerHugs/master

adds swiping functionality to mobile pictures
fixed icons
Merge remote-tracking branch 'origin/master' into ollie
Added Twitter API workaround (No O-Auth needed)
Added Twitter API workaround No O-Auth needed
Styled Twitter Container
Merge pull request #20 from JayWIlsonJr/master

Adds Twitter Feed
commit pre twitter feed add
post twitter feed add
design almost done, needs confirmation
Merge pull request #21 from olliegill/ollie

Ollie