add an init
Merge branch 'master' of github.com:ammoses89/iswc-search
Merge branch 'master' of github.com:ammoses89/iswc-search
merge with remote server
added uwsgi
resolve merge conflicts