new rails site
Second commit
improves 03/29
Daily Index Controller
Added more features
Updated new stff
more refractor
added jquery
Updated layout and live-json
updated layout to bootstrap 3
Merge branch 'master' of github.com:stephenzsy/labyrinth

Conflicts:
	README.md
updated more layout
refactor of repository
remove file
refactored logic
'cached-json' fc
more improvements on the view
removed multicolumn display for article titles
news_article scaffold
news articles template