Made on Cloud 9
Fixed up gitignroe conflict