added application.yml to ignore
removed application.yml from repo
Merge branch 'master' of https://github.com/charyorde/acm_grading.git
Merge branch 'master' of https://github.com/charyorde/acm_grading.git

Conflicts:
	application.yml