Added require.js

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   config.js
#
Use require.js
Merge remote-tracking branch 'upstream/master'

Conflicts:
	public/js/app.js
	public/views/index.hbs