committed deleted files
added jasmine and 4 tests for ajax calls
Merge branch 'tjblonsk-master'

Conflicts:
	Gemfile.lock
nav bar altered