Merge branch 'master' of github.com:danlinde/sifiapp into more_styling
Merge branch 'master' of https://github.com/danlinde/sifiapp

Conflicts:
	app/assets/stylesheets/application.css.erb
response bug
Merge branch 'master' of https://github.com/danlinde/sifiapp
merged
Merge pull request #36 from danlinde/fridayday

Fridayday