asdas
asdas
asdas
asdas
asdas
Merge branch 'master' of https://github.com/averageazn247/tamulol

Conflicts:
	app/views/layouts/_header.html.erb