i need to pull
Merge branch 'master' of https://github.com/cjkirk09/BYUGetMeThere

Conflicts:
	static/app.js
	static/index.html