resources added
Merge branch 'master' of https://github.com/designeng/cola_forked