not sure what I've added
Merge branch 'dev' of github.com:owlbytes/HootsApp into chore/test_scripts2
testing bug fix
midway through fixing cancan
transparent bar and fixed divs on index page
Merge branch 'dev' of github.com:owlbytes/HootsApp into chore/sassy_css

Conflicts:
	app/assets/stylesheets/posts.css.scss
cancan issue fixed
Merge branch 'dev' of github.com:owlbytes/HootsApp into chore/test_scripts2
styling change
Show views from edit post. Made edit and new post view consistent. Alters JS to count digits on load
Merge branch 'features'
Merge branch 'dev' of github.com:owlbytes/HootsApp into chore/alex_bug_fix
restricted number of comments to 5 latest
Merge branch 'dev' of github.com:owlbytes/HootsApp into comments
score styling
Merge branch 'dev' of github.com:owlbytes/HootsApp into chore/alex_bug_fix
Merge branch 'dev' of github.com:owlbytes/HootsApp into dev
Merge branch 'chore/alex_bug_fix' into dev

ts
Merge branch 'dev' into features
Merge branch 'features'