First commit of my personal website
Added AngularJs with first Controller
Merge origin/master

Conflicts:
	index.html