Reverting a couple of changes I was testing.
Merge branch 'master' of https://github.com/caseyvill/Project-Barbosa into packing-list

Conflicts:
	public/js/application.js
	public/js/config/routes.js
Merging with master.
Merge branch 'master' of https://github.com/caseyvill/Project-Barbosa into packing-list

Conflicts:
	public/js/application.js
	public/js/config/routes.js