added line 1 and line 2 codes
Merge branch 'develop' of https://github.com/andredyl/JS-App_FH2013 into develop

Conflicts:
	frontend/zumradtest.txt