Merge pull request #2 from gnowxilef/master

update css to new bootstrap, CHANNEL name now in settings
changed default CHANNEL to be 'CAA'