Edited .gitignore
Made more interface changes throughout.
Messed up previous commit. This one should work.
MERGED A LOT OF FILESgit status