Fixed mobile menu screen bug
Fixed button and images
solved merge conflicts
Merge pull request #2 from tiy-durham-june2014-frontend/mason-branch

Mason branch
updated license
fixed merge conflicts
merged amy and master
added fake data to get templates functional
committing changes to allow deploy
merged gh-pages
updating for deploy
merging in changes saved to gh-pages