- added html/form.html
added OSX to gitignore
seapal import
- added html/form.html
- added weather form
Merge branch 'feature/html-form' of https://github.com/pakohan/webtec into feature/html-form
Merge branch 'feature/html-form' into develop
css
made some css changes
added bootstrap
made some tests
Merge branch 'feature/css' into develop
Header & Footer added
Header & Footer added
prettyfied logo
renamed files
Merge branch 'develop' of https://github.com/pakohan/webtec into develop

Conflicts:
Merge branch 'feature/nicer-interface' into develop
moved files

next step: renaming links in files
fixed navbar