integrated landing page
Merge branch 'master' of https://github.com/arka-g/hackRU2014Mac

Conflicts:
	server/hackru/app/views/landing.blade.php