code
Merge branch 'master' of https://github.com/deepthidevaki/projektA

Conflicts:
	src/Test.java