Connor Turland 1c14b59238 Merge branch 'develop' into feature/stars		2016-08-30 17:05:00 -04:00
..
images	proper star icon	2016-08-30 14:55:18 -04:00
javascripts	Merge branch 'develop' into feature/stars	2016-08-30 17:05:00 -04:00
stylesheets	Merge branch 'develop' into feature/stars	2016-08-30 17:05:00 -04:00