messing around
Merge branch 'master' into david
make money
Merge branch 'master' into david
got iron-router working, two basic pages
forgot to add new pages, this adds them
removed stupid stuff from david branch