Refactoring and adding specs - TDD from here on out :)
Merge branch 'master' of github.com:lserman/lockdown

Conflicts:
	README.md