added initial styling
fixed conflicts
style fixes
style updates
Merge branch 'master' into Adrienne

Conflicts:
	views/index.ejs