new makeup
fixed
after merge
fixed navbar
added fotorama
makeup project page
add project files
Merge branch 'dev' into projects
add makeup projects