added a line to gitignore (no more *__.ia)
Merge branch 'master' of https://github.com/JDong820/EE319k