add modal for file loading
Merge branch 'master' into audio_modal

Conflicts:
	log/development.log
	tmp/pids/server.pid
Merge pull request #16 from gsperka/audio_modal

add modal for file loading
Delete tmp and log folders which should be gitignored
fix audio file routing
Merge branch 'master' into test-audio-file
Merge pull request #17 from gsperka/test-audio-file

Test audio file
Update README.md
Update README.md
Update README.md
switch profile link to welcome username
Merge pull request #18 from gsperka/remove_profile_links

switch profile link to welcome username
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
log
Merge branch 'master' into stuff

Conflicts:
	app/assets/javascripts/application.js
	log/development.log
	tmp/pids/server.pid