fixed image
resolved merge conflicts
merging amy into master
merged amy
fixed bugs
more merge conflicts
minor spelling fix in index.html
more bugs
more bugs
syncing with master
fixed merge conflict
Merge pull request #3 from tiy-durham-june2014-frontend/mason-branch

Mason branch
added pop-out label
Merge branch 'master' of https://github.com/tiy-durham-june2014-frontend/broccoli into mason-branch
fix yet another bug
made changes to main.js
cleaning up framework