g
Merge branch 'master' of https://github.com/nikolayStavrev1/wwwTech2014

Conflicts:
	src/com/wwwTech2014/HelloBean.java