Initial commit
updated color scheme
merge