Merge branch 'master' into nick's-branch
grunt test fix
login error alert
Merge branch 'master' into nick's-branch

Conflicts:
	osprey-dev2/gruntfile.js
merge
fixing merge conflict
pretty stuff

added alerts for invalid login / register attempts, added color scheme
css file
Added more unit testing and began working on some error handling
Installed mocha, should.js, grunt-mocha-test, etc and added unit testing for server side at app/tests/unit
Merge pull request #1 from pemami4911/errors-dev

Installed mocha, should.js, grunt-mocha-test, etc and added unit testing...
Added test instructions
Update README.md
Resolving uncommitted changes
Merge branch 'master' of https://github.com/pemami4911/Osprey

merging into local master branch
Added unit testing for our splashService and for regController. Also added the 'userType' value to our user model and I have the header on the registration page dynamically changing to match the user selection
Merge pull request #2 from pemami4911/unit-testing

Added unit testing for our splashService and for regController. Also add...
Finished writing unit tests for our first sprint git status! Also added a brief To-Do list for things i've noticed that might need changing
Merge pull request #3 from pemami4911/more-unit-testing

Finished writing unit tests for our first sprint git status! Also added ...
Caught a misspelling error
split registration view and controllers, changed unit tests to reflect changes