Merge branch 'master' into Cole
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'master' into Cole
Merge branch 'John'
add Repository button. more documentation
Merge branch 'master' into Cole
add progressBar div and function. not accurate
Merge branch 'John'
Merge branch 'master' into Cole

Conflicts:
	js/main.js
Merge branch 'John'
added progressBar styling and functionality
Merge branch 'Cole'
Merge branch 'John'
Merge branch 'master' into John