A dummy commit after practically no changes.

Tampered with migrations so that field order in schema file got
changed, that's all.
Merge branch 'master' of github.com:jtirila/teamsort

Conflicts:
	db/schema.rb