Converted landing page to angular
Merge branch 'angular-landing-page'

Conflicts:
	app/scripts/album.js
	app/scripts/app.js
	app/stylesheets/app.scss
	public/javascripts/app.js
	public/javascripts/app.js.map
	public/stylesheets/app.css
	public/stylesheets/app.css.map