Added tag creation
refactored js
Merge branch 'alain_integration' into tom_integration

Conflicts:
	app/controllers/tags_controller.rb
	app/models/tag.rb
	app/views/tags/new.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'alain_integration' into tom_integration

Conflicts:
	app/controllers/tags_controller.rb
	app/models/tag.rb
	app/views/tags/new.html.erb
	config/routes.rb
	db/schema.rb
Merge branch 'tom_integration' of github.com:QualityAssured/ExpenseDividerApp into tom_integration
user_ids are posted to the BillsController
Added select box for users to bills/new
Merge branch 'alain_integration' into tom_integration

Conflicts:
	app/assets/javascripts/custom.js
	app/controllers/bills_controller.rb
	app/views/bills/new.html.erb
merged tom/alain
Created TagsWithAmounts model
Added granularity for number fields
Added rspec and first test
added rspec foundation
Added controller specs for BillsController
Merge remote-tracking branch 'origin/master' into alain_integration
merge bills_controller_spec