my first commit
merging
merging
Merge https://github.com/kenrom/heroku

Signed-off-by: kenrom <ken.romero@gmail.com>

Conflicts:
	.DS_Store
	package.json
	views/about.html
	views/contact.html
	views/cv.html
	views/index.html
	views/lab.html
	views/main.html
	views/profile.html
	views/skills.html
merging

Signed-off-by: kenrom <ken.romero@gmail.com>
blah
merging

Signed-off-by: kenrom <ken.romero@gmail.com>