Font-awesome, main.scss
merge fix
Merge branch 'master' of https://github.com/LeeFlannery/doesitsuck