gitignore
Merge branch 'step2' of https://github.com/skibaa/play-meetup2-jan14 into step2
Merge branch 'step3' of https://github.com/skibaa/play-meetup2-jan14 into step3
Merge branch 'step4' of https://github.com/skibaa/play-meetup2-jan14 into step4