new 4 nikola
Merge branch 'master' of https://github.com/UnicornEnergy/Prototype

Conflicts:
	db/schema.rb
Merge branch 'master' of https://github.com/UnicornEnergy/Prototype

Conflicts:
	db/schema.rb