changes to points..
Merge branch 'potali-5-1' of https://github.com/mdk199/rorproject into potali-5-1

Conflicts:
	db/schema.rb