Edited gitlab.java
Creating conflict
Merge branch 'master' of https://github.com/Peggytastic/test

Conflicts:
	.DS_Store
	src/.DS_Store