add two useless lines
add a very important task
add AJAX
add liking
Merge branch 'add_rake_task'

Conflicts:
	app/helpers/application_helper.rb