working changes
merge
fixing .gitignore
Fixing Stuff
Merge branch 'master' of https://github.com/bDino/IS2014
Ignoring *.BAK