Merge branch 'master' into modal

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge pull request #12 from nguidry/playerview

Playerview
added links to the social media icons on the modal
Merge pull request #13 from nguidry/modal

Modal
added a main js file that holds the fb login and twitter code to get it out of the index file
Merge branch 'master' into playerview

Conflicts:
	public/js/main.js