Initial commit with .gitignore
Removed whitespace
Merged in previous commits
Removed old code
Updated .gitignore