ignore swp
Merge branch 'master' into feature/solutions
Merge branch 'master' into feature/solutions
solution placeholder
Merge branch 'master' into feature/solutions
layout
add swo to gitignore
Merge branch 'develop' into feature/solutions
add feature icon
ignore temp files
fix merge gitignore
add features
Merge branch 'feature/solutions' into develop