All files added to remote respository
js file
Merge branch 'master' of https://github.com/austindg/personal

Conflicts:
	README.md