Worked with article creation, rearranged index
Merge branch 'master' of github.com:myfashionhub/leafthru

rearranged index page
added collections and working on save button
Merge branch 'master' of github.com:myfashionhub/leafthru
Sunday morning commit
Move app.js to application.js
Merge branch 'master' of github.com:myfashionhub/leafthru

Conflicts:
	app/views/welcome/index.html.erb
Merge branch 'master' of github.com:myfashionhub/leafthru

Conflicts:
	app/assets/javascripts/app.js
	app/assets/javascripts/application.js
	app/assets/javascripts/article.js
late commit
Merge branch 'master' of github.com:myfashionhub/leafthru

Conflicts:
	app/assets/javascripts/application.js
	app/assets/javascripts/article.js
	app/views/welcome/index.html.erb
	db/seeds.rb
interest ids and index, interest_reader_join work, interest profile form
Merge branch 'master' of github.com:myfashionhub/leafthru

Conflicts:
	app/assets/javascripts/application.js