edited
added dist folder
updated branch
fixed merge conflicts and added external JS file
resolved merge conflicts
Merge pull request #1 from tiy-durham-june2014-frontend/mason-branch

Mason branch