commting gem lock
commit new stuff
Merge remote-tracking branch 'upstream/master'
gem.lock again
Merge remote-tracking branch 'upstream/master'
fixed allergies
Merge pull request #16 from DennisMarcu/master

fixed allergies