added masonry and got it to work. remember to add bower and classie otherwise shit wont work. good shit.
prior to a merge, working on getting layout correctly
Attempting another commit
pulled and merged and fixed conflicts that werent actually real conflicts