Merged current Project

Everything is currently in AI folder, was going to rename, but didn't
want to mess with it yet. Everybody's stuff is still there.