ignoring solution binary file
Merge branch 'master' of https://github.com/zpatrick/Takeoff

Conflicts:
	Takeoff/Takeoff.v12.suo