Made changes to get into android studio
Fixed some conflicts between my slight changes and the master