wq
adding updated gitignore
Merge branch 'master' of github.com:hahnicity/harmonify

Conflicts:
	Procfile
	manage.py
removing ivanthai dir