Removed .gitignore from top directory
Added TODO
Merge remote-tracking branch 'origin/master'