Layout change.
Merging after fixing.
Added a .gitignore file.
Added the gitignore and stopped tracking some files.