Added new content
Merge branch 'master' of https://github.com/pemami4911/Osprey

Conflicts:
	.DS_Store
	osprey-dev2/.DS_Store
	osprey-dev2/public/.DS_Store
	osprey-dev2/public/public/css/jumbotron-narrow.css
	osprey-dev2/public/public/dashboard.html
	osprey-dev2/public/public/img/Osprey-Logo-small.png
	osprey-dev2/public/public/index.html
	osprey-dev2/public/public/js/core.js
	osprey-dev2/public/public/lib/angular-touch/README.md
	osprey-dev2/public/public/lib/angular-ui-utils/.travis.yml
	osprey-dev2/public/public/lib/angular/.bower.json
	osprey-dev2/public/public/lib/angular/README.md
	osprey-dev2/public/public/lib/angular/angular.js
	osprey-dev2/public/public/lib/angular/angular.min.js
	osprey-dev2/public/public/lib/angular/bower.json
	osprey-dev2/public/public/lib/bootstrap/.bower.json
	osprey-dev2/public/public/lib/bootstrap/Gruntfile.js
	osprey-dev2/public/public/lib/bootstrap/LICENSE
	osprey-dev2/public/public/lib/bootstrap/README.md
	osprey-dev2/public/public/lib/bootstrap/bower.json
	osprey-dev2/public/public/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.eot
	osprey-dev2/public/public/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf
	osprey-dev2/public/public/lib/bootstrap/dist/fonts/glyphicons-halflings-regular.woff
	osprey-dev2/public/public/lib/bootstrap/fonts/glyphicons-halflings-regular.eot
	osprey-dev2/public/public/lib/bootstrap/fonts/glyphicons-halflings-regular.ttf
	osprey-dev2/public/public/lib/bootstrap/fonts/glyphicons-halflings-regular.woff
	osprey-dev2/public/public/lib/bootstrap/js/affix.js
	osprey-dev2/public/public/lib/bootstrap/js/alert.js
	osprey-dev2/public/public/lib/bootstrap/js/button.js
	osprey-dev2/public/public/lib/bootstrap/js/modal.js
	osprey-dev2/public/public/lib/bootstrap/js/tab.js
	osprey-dev2/public/public/lib/bootstrap/less/pager.less
	osprey-dev2/public/public/lib/bootstrap/less/pagination.less
	osprey-dev2/public/public/lib/bootstrap/package.json
	osprey-dev2/public/public/lib/jquery/.bower.json
	osprey-dev2/public/public/lib/jquery/MIT-LICENSE.txt
	osprey-dev2/public/public/lib/jquery/bower.json
	osprey-dev2/public/public/lib/jquery/dist/jquery.js
	osprey-dev2/public/public/lib/jquery/src/ajax.js
	osprey-dev2/public/public/lib/jquery/src/ajax/xhr.js
	osprey-dev2/public/public/lib/jquery/src/core.js
	osprey-dev2/public/public/lib/jquery/src/css.js
	osprey-dev2/public/public/lib/jquery/src/css/swap.js
	osprey-dev2/public/public/lib/jquery/src/data.js
	osprey-dev2/public/public/lib/jquery/src/deferred.js
	osprey-dev2/public/public/lib/jquery/src/effects.js
	osprey-dev2/public/public/lib/jquery/src/event.js
	osprey-dev2/public/public/lib/jquery/src/intro.js
	osprey-dev2/public/public/lib/jquery/src/jquery.js
	osprey-dev2/public/public/lib/jquery/src/offset.js
	osprey-dev2/public/public/lib/jquery/src/outro.js
	osprey-dev2/public/public/lib/jquery/src/queue.js
	osprey-dev2/public/public/lib/jquery/src/selector.js
	osprey-dev2/public/public/lib/jquery/src/var/arr.js
	osprey-dev2/public/public/lib/jquery/src/var/pnum.js
	osprey-dev2/public/public/lib/jquery/src/var/push.js
	osprey-dev2/public/public/lib/jquery/src/wrap.js
	osprey-dev2/public/public/views/registration.html
	osprey-dev2/public/public/views/splash.html