last edit
resolve merge issue
Merge branch 'master' of github.com:Lyr3x/Jarvis

Conflicts:
	views/index.erb