commit from home
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/artifacts/icmyfuture.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/vcs.xml
	src/META-INF/MANIFEST.MF
	src/icmyfuture/First.java
workspace

workspace