Merge branch 'master' of https://github.com/rbarbera/irregularverbs

Conflicts:
	IrregularVerbs.xcodeproj/project.pbxproj
	IrregularVerbs/HistoryViewController.h
	IrregularVerbs/HomeViewController.m
	IrregularVerbs/HomeViewController.xib
new UI integration and color unity ;)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	IrregularVerbs.xcodeproj/project.pbxproj
	IrregularVerbs/HistoryViewController.xib
	IrregularVerbs/HomeViewController.m
	IrregularVerbs/HomeViewController.xib