Added necessary gems.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/parser/parser.rb
Fixed the Gemfile, beginning work on parser.
Merge remote-tracking branch 'origin/master'