Merge pull request #2 from RBirkeland/master

my test commit
adding instructions
Merge branch 'master' of github.com:Filip-Ter/Smart-Travel
df
Henrik added text
Merge pull request #3 from HSkogmo/master

Henrik added text
test
Merge pull request #4 from Rosie-Brigham/master

merging web data
test
Merge pull request #5 from Rosie-Brigham/master

test
testing
Merge pull request #6 from gempio/master

testing
Added jQuery and core.js
continues styles - basic layout
Merge pull request #8 from Rosie-Brigham/master

continues styles - basic layout
Merge pull request #7 from gempio/master

Added jQuery and core.js
Added dummy functions in JS for reference.
continues styling, one step at a time...
Merge pull request #9 from gempio/master

Added dummy functions in JS for reference.
Merge pull request #10 from Rosie-Brigham/master

continues styling, one step at a time...
php