Small Markup Changes
Fixed merge conflict
Added .gitignore: obj/ bin/
Removed untracked folders