Test
Initial commit
fixed merge errors from new repo
Merge branch 'master' of heroku.com:letspin

Conflicts:
	.gitignore
	README.md
Fixing heroku email
Stiill trying..
...
Think i got it
comiling changes..
...
...!
Fized email sending for heroku
Fized email sending for heroku
adding lockable and timeoutable to app
local email messed up
fixing
Merge branch 'master' of heroku.com:letspin
..
schema stuff
Merge branch 'master' of https://github.com/fmeade/letspin

Conflicts:
	.gitignore
	config/environments/development.rb
	config/environments/production.rb
	config/initializers/devise.rb