yo yo no commit???
Merge branch 'master' of git@github.com:elvirag/General.git

Conflicts:
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat