Modified .htacces to include HTML
Added .gitignore to ignore netbeans configuration files
first stage div, ul-li and logo
Some other files
setting logo ing and container
Navigation bar setup
Changes in album_of_the_month.html
Styles for general box of featured album
Included styles.css in the head.html file
Included image button.png
setup user-nav
Merge branch 'feature/Home-base-Makup' into develop
Changed to featured.css
Import of featured.css in styles.css
Include bullet.png for list
Merge branch 'feature/featured-album' into develop

Conflicts:
	css/styles.css
	includes/head.html
	index.html

Solved conflicts
setup bottom nav bar and social icons
Created files for other-albums-block
Css, Less, html
Changes to the includes structure
Ready to start css for the block
FInished css for other albums
Merge branch 'feature/other-albums' into develop
Added border top to content
Fixed border thickness for content
setup secondary nav and social icons
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	index.html
Merge remote-tracking branch 'origin/develop' into feature/home-markup-bottom-section

Conflicts:
	css/home.css
	css/home.less
	index.html