relayout
Edited
Edited
edited
Merge branch 'jacky' of github.com:jacky5283/feelsion into jacky
upgrade to rails 4
removed extra files