Issue 20 resolved
Merge branch 'master' of https://github.com/fanGroup/FanLabsSite