initial commit
initial bootstrap setup
less files and jquery
Merge branch 'dev'
moving jquery files
main.css and main.less
Featured Projects section; missing jquery function to scroll images without stacking
Deleted homepage.html
Removed JQuery
minor changes
Merge branch 'master' of github.com:willrainit/cs351-fall2013 into osvaldor

Conflicts:
	public_html/lib/css/main.css
	public_html/lib/less/main.less
Merge branch 'master' of github.com:willrainit/cs351-fall2013 into osvaldor

Conflicts:
	public_html/lib/css/main.css
	public_html/lib/less/main.less
Deleted homepage.html
removing sample2.html
Adding Featured Projects
removing artist.png and mockup.html
Removing Featured Projects, artist.png and mockup.html from master.
Merge branch 'master' of github.com:willrainit/cs351-fall2013
Adding Featured Projects
Removing Featured Projects