Fixed .gitignore not ignoring files http://stackoverflow.com/questions/1139762/gitignore-file-not-ignoring
Merge from master complete with .gitignore files working properly
Revert "Updates to gitignore"

This reverts commit c9d7a3a53b559b509eead0b1fbd77d4df110a582.
Attempting to re-add files that were missing
Merge branch 'master' of https://github.com/VinojZ/ABCD-Company into hp