Same problem.
Merge branch 'master' of https://github.com/ubersapiens/albm

Conflicts:
	albm_test
Removed weird db files
Removed db yml and updated gitignore