Merge branch 'development'
Update .gitignore
Update to use color schemes
Move resources to resources folder