Insults from BDD for generate
Merge branch 'master' of github.com:emoc11/itp-app

Conflicts:
	itp-app/ViewController.swift