css edits
fiddling around
Merge branch 'master' into kyle
style edits
tweaks to images
edit css
css changes
Merge branch 'master' into paul
Merge branch 'master' of github.com:kschmit90/TaskManagerProject
Merge branch 'master' into Jen
merge conflict
css edits
image adjust
Merge branch 'master' of github.com:kschmit90/TaskManagerProject
html edit
Merge branch 'master' of github.com:kschmit90/TaskManagerProject
Merge branch 'master' into kyle
New base CSS. Working to fix footer.
Merge branch 'master' of github.com:kschmit90/TaskManagerProject

Conflicts:
	app/assets/stylesheets/global.css
	app/views/layouts/application.html.erb
Formatting.