branch 2
Merge branch 'feature_1'

Conflicts:
	main.c
Merge branch 'master' of https://github.com/rohanshar/training

Conflicts:
	main.c