test commit
Merge branch 'master' of https://github.com/nkuebler000/citest1
minified images / css / concat scripts / layout updates