First Flow
Added ds_store to gitignore
no message
Merge branch 'develop' of github.com:samsao/WearhacksMTL2014 into develop

Conflicts:
	Wearhacks.xcodeproj/project.pbxproj
	Wearhacks/Base.lproj/Main.storyboard
	Wearhacks/ViewController.h
	Wearhacks/ViewControllers/Login/LoginViewController.h
	Wearhacks/WearHacksHomeViewController.h
Base commit
Merge branch 'develop' of github.com:samsao/WearhacksMTL2014 into develop

Conflicts:
	Wearhacks.xcodeproj/project.pbxproj
	Wearhacks/Base.lproj/Main.storyboard
	Wearhacks/Helper/WearHacksUtility.h
	Wearhacks/Helper/WearHacksUtility.m
	Wearhacks/ViewControllers/Login/HomeViewController.h
	Wearhacks/ViewControllers/Login/HomeViewController.m
	Wearhacks/ViewControllers/Login/LoginViewController.h
	Wearhacks/ViewControllers/Login/LoginViewController.m
	Wearhacks/WHHomeViewController.h
	Wearhacks/WHHomeViewController.m
	Wearhacks/WHLoginViewController.h
	Wearhacks/WHLoginViewController.m
	Wearhacks/WHUtility.h
	Wearhacks/WHUtility.m
	Wearhacks/WearHacksHomeViewController.h
	Wearhacks/WearHacksHomeViewController.m
	Wearhacks/WearHacksLoginViewController.h
	Wearhacks/WearHacksLoginViewController.m
	Wearhacks/WearHacksUtility.h
	Wearhacks/WearHacksUtility.m