Update README.md
Unit testing now works
Merge branch 'master' of https://github.com/pemami4911/Osprey

merging with master
merge
fixing merge conflict
pretty stuff

added alerts for invalid login / register attempts, added color scheme
css file
Merge branch 'master' into nick's-branch

Conflicts:
	.DS_Store
	osprey-dev2/public/.DS_Store