i guess i need to commit before pulling ur file updates
Merge branch 'master' of https://github.com/gdepaul/Lab1

Conflicts:
	Lab1.X/nbproject/Makefile-genesis.properties
	Lab1.X/nbproject/configurations.xml