restyled
merge conflict done
Fixed the merge conflict
Merge pull request #52 from red-admirals-2014/restyle-css

restyled
Merge branch 'master' into move_mic_request
get latest master