bunny joke
Gabor's commit
Merge pull request #3 from Peter-Varsanyi/peterva_feature

bunny joke
Merge branch 'master' of https://github.com/gaboom/angular-seed into s123333
Merge pull request #1 from GaborSzalay/s123333

S123333 new branch fromGabor
Merge branch 'master' of https://github.com/gaboom/angular-seed into S12398

Conflicts:
	app/partials/partial1.html