merging remote master
fixed UTF-8 encoding issue
merging remote master
added @import rules to manifest file
resolved merge conflict on home page
resolving merge conflicts
minor changes
pulled remote master
begin templating
merging master
adding underscore.js gem
Added the templates via script tags
fixed merge conflict
merging master
repeated bundle install
Merge branch 'Styling' of https://github.com/TIYA-Durham-GDI/GDI-rails-4 into Styling

Conflicts:
	db/schema.rb
Got json data showing up
Compiling the template
fix typo
in data binding hell