blah
Merge branch 'master' of github.com:DrJid/Frood

Conflicts:
	Frood/ViewController.swift
Added gitignore