Merge branch 'webmocha'
Removed font awesome - wasn't needed
Merge branch 'master' into webmocha