2014-06-17: Added .gitignore, Updateed macros