Remove BASSCSS, not ready to be in master
Merge branch 'master' of github.com:great-horned-owls-2014/puppy-love
Pull in all new changes to test out
Merge branch 'styling' of github.com:ShirajG/puppy-love
Pulling in styling changes-
Conflicts:
	app/assets/stylesheets/basscss.css
Merge branch 'master' of github.com:great-horned-owls-2014/puppy-love
Bring project up to date
Fix bug that prevented owners from creating new accounts.
Merge pull request #40 from ShirajG/master

Fix Owner creationbug