Sign_in
Merge pull request #15 from Sidnah/dev

Heroku
Merge pull request #18 from Sidnah/dev

Heroku
Merge pull request #19 from Sidnah/dev

css
Merge pull request #20 from Sidnah/dev

css-2
Merge pull request #21 from Sidnah/dev

assets
Merge pull request #22 from Sidnah/dev

assets path
Merge pull request #23 from Sidnah/dev

heroku
Page create account
test
test
Correct form sign up
Page new_password
User's feed
Delete <form>
Merge branch 'dev' of github.com:Sidnah/happ into dev

Conflicts:
	app/assets/stylesheets/application.css
Merge remote-tracking branch 'origin' into dev