more cleanup after messy merge
Merge pull request #25 from zrivest/css_and_file_check_after_major_merge_conflict

more cleanup after messy merge