less-rails added to the webapp
Merge branch 'initLess' into origin/develop
Blackbutton added to bootstrap
Merge branch 'initLess' into develop
Merge branch 'addMainLayout' into develop
Merge branch 'develop' into signInView
haml added to webapp
Merge branch 'addHaml' into develop
Merge branch 'develop' into signInView
Merge pull request #4 from flower-pot/develop

Develop
Sign In view converded to hamel and Buttons added
Merge branch 'signInView' into develop
converded to haml, bootstrap added
Merge branch 'signUpView' into develop
removed old erb file
Merge branch 'develop' of github.com:jannishuebl/suploy-webapp into develop

Created new Gemfile.lock by running bundle install

Conflicts:
	Gemfile.lock