.
Merge branch 'layout' of https://github.com/ajbecker/3btasks into layout
Merge branch 'layout' of https://github.com/ajbecker/3btasks into layout

Conflicts:
	js/main.js
Added favicon and a webfont plus a little more style