Merge pull request #19 from xiplias/master

Replaces twitter with github link
remove link to node-modules twitter
Merge pull request #20 from xiplias/addLinkToLargeLogo

Add link to large logo
Merge remote-tracking branch 'origin/master' into useBaseTemplate

Conflicts:
	views/about.html