Initial commit
Merge https://github.com/Varu01234/Web-Programming

Conflicts:
	README.md
Initial commit
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/.DS_Store
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/css/.DS_Store
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/css/demo.css
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/css/font-awesome.css
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/css/style.css
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/font/fontawesome-webfont.eot
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/font/fontawesome-webfont.svg
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/font/fontawesome-webfont.ttf
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/font/fontawesome-webfont.woff
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/images/.DS_Store
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/images/bg.jpg
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/images/bg2.jpg
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/images/bg3.jpg
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/images/blurred.jpg
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/images/noise.png
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/images/wood_pattern.jpg
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/index.html
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/index2.html
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/index3.html
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/index4.html
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/index5.html
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/js/jquery.placeholder.min.js
	new file:   CustomLoginFormStyling/CustomLoginFormStyling/js/modernizr.custom.63321.js
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._.DS_Store
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._css
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._font
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._index.html
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._index2.html
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._index3.html
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._index4.html
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/._index5.html
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/css/._.DS_Store
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/css/._demo.css
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/css/._font-awesome.css
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/css/._style.css
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/font/._fontawesome-webfont.eot
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/font/._fontawesome-webfont.svg
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/font/._fontawesome-webfont.ttf
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/font/._fontawesome-webfont.woff
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/images/._.DS_Store
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/images/._bg.jpg
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/images/._bg2.jpg
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/images/._bg3.jpg
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/images/._blurred.jpg
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/images/._noise.png
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/images/._wood_pattern.jpg
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/js/._jquery.placeholder.min.js
	new file:   CustomLoginFormStyling/__MACOSX/CustomLoginFormStyling/js/._modernizr.custom.63321.js
Merge https://github.com/Varu01234/CustomLoginFormStyling

Conflicts:
	README.md
 It looks like you may be committing a merge.
	modified:   Project/index.php
	modified:   Project/style/main.css