merging twitter partial
Merge remote-tracking branch 'origin/master'

Conflicts:
	partials/twitter.html
Merge branch 'master' of https://github.com/connormccutcheon/apicon