First Actual Branch Instance
Merge branch 'alex' of https://github.com/BrainComputationLab/ncr into alex

Conflicts:
	README.md
	ncr_server.py
	static/assets/js/lib/angular-resource.js
	static/assets/js/ncr/.DS_Store
	static/assets/js/ncr/DBManager.js
	static/assets/js/ncr/UserManager.js
	static/assets/js/ncr/controllers/DBController.js
	static/assets/js/ncr/controllers/UserController.js
	static/assets/js/ncr/reports/sample_data.js
	templates/global/header.html
	templates/index.html
	templates/pages/database/.DS_Store
	templates/pages/database/components/.DS_Store
	templates/pages/database/components/dataTable.html
	templates/pages/database/components/dataTablePagination.html
	templates/pages/database/components/lifDetails.html
	templates/pages/database/components/modelInfo.html
	templates/pages/database/components/modelInfoLIF.html
	templates/pages/database/components/modelSearch.html
	templates/pages/database/database.html
	templates/pages/reports/reports.html
Testing First Branch
After Correcting GitHubs Errors
Merge branch 'alex'

Conflicts:
	ncr_server.py
	static/assets/js/ncr/controllers/DBController.js
	templates/.DS_Store
	templates/pages/database/components/.DS_Store
	templates/pages/database/components/dataTable.html
	templates/pages/database/components/lifDetails.html
	templates/pages/database/components/modelSearch.html
	templates/pages/reports/reports.html