Removed defaults from app...rb
Merge branch 'master' of https://github.com/iamadawra/calblueprintHack

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/iamadawra/calblueprintHack