4/22 basic stuff
Merge origin/master

Conflicts:
	public/css/bootstrap.min.css
4/23 bootstrapmincss
4/23 - all changes till this point
4/23 - all changes till this point
4/23 - all changes till this point
4/23 - all changes till this point
4/23 all mikes changes
Merge origin/master
4/23 stuff
4/23 stuff