initial cmmit
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/.generators
	.idea/.rakeTasks
	.idea/choubane.iml
	.idea/vcs.xml
	app/assets/javascripts/audio_player.js
	app/controllers/welcome_controller.rb
	app/models/audio.rb
	app/views/audios/_player.html.erb
	app/views/audios/index.html.erb
	app/views/elements/_navbar.html.erb
	app/views/welcome/index.html.erb
	config/routes.rb
audio player integration
post writing