extra checking for empty entries
Merge branch 'master' of github.com:Cogges/cogges.github.io
Merge branch 'master' of github.com:Cogges/cogges.github.io