Sorts gems, adds active_model_serializers + pry
Merge branch 'master' of github.com:kalamarico/demo-dashboard

Conflicts:
	Gemfile
	Gemfile.lock